* src/Makefile.in (LIBX_OTHER): Move out of cpp section.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3bacfa8a7ab5795c0282b2ad29943ccab027041a..eecf720896b6f9e9d944237ac431a04088e5991c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (LIBX_OTHER): Move out of cpp section.
+
        * Makefile.in (LIBXT): Always define.
 
 2010-05-15  Glenn Morris  <rgm@gnu.org>

diff --git a/src/Makefile.in b/src/Makefile.in
index 6031e159da80d8f06a36f07b7159c32992a045b6..61e2fbb671ce224a210f689eb05672123b64aa0b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -190,6 +190,9 @@ TOOLKIT_LIBW=@TOOLKIT_LIBW@
 ## Only used if HAVE_X11, in LIBX_OTHER.
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 
+## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
+LIBX_OTHER=@LIBX_OTHER@
+
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
 
@@ -311,9 +314,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 #endif /* HAVE_X_WINDOWS */
 
-/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.  */
-LIBX_OTHER=@LIBX_OTHER@
-
 /* A macro which other sections of Makefile can redefine to munge the
    flags before they are passed to LD.  This is helpful if you have
    redefined LD to something odd, like "gcc".